Skip to content

[action] [PR:23536] [generic_hwsku] add platform.json support to port_config_gen module#1193

Merged
mssonicbld merged 1 commit into
Azure:202512from
mssonicbld:cherry/msft-202512/23536
May 14, 2026
Merged

[action] [PR:23536] [generic_hwsku] add platform.json support to port_config_gen module#1193
mssonicbld merged 1 commit into
Azure:202512from
mssonicbld:cherry/msft-202512/23536

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

Description of PR

Summary:
Add platform.json support to the port_config_gen Ansible module (fanout port config generator). When hwsku.json exists and platform.json contains a non-empty interfaces section, use them for port config lookup. Fall back to port_config.ini otherwise.

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511

Approach

What is the motivation for this PR?

This is part of the larger effort to support generic HWSKUs. One of the steps toward that goal is removing the dependency on port_config.ini (sonic-net/sonic-buildimage#24494). The port_config_gen Ansible module currently relies solely on port_config.ini for port configuration, so it needs to be updated to also support platform.json.

The changes are in line with the existing port config resolution logic in device_info.py.

How did you do it?

  • Add JSON-based port config lookup: use platform.json when hwsku.json exists and interfaces section in platform.json is populated. Use port_config.ini otherwise
  • Define _read_from_json() to parse platform.json into the same alias-keyed dict format as _read_from_port_config()

How did you verify/test it?

Tested on T1 and LT2 platforms: ran port_config_gen.py via an Ansible stub and verified the new platform.json + hwsku.json path generates the same port config as the legacy port_config.ini path.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

Signed-off-by: Sonic Build Admin sonicbld@microsoft.com

<!--
Please make sure you've read and understood our contributing guidelines;
https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md

Please provide following information to help code review process a bit easier:
-->
### Description of PR
<!--
- Please include a summary of the change and which issue is fixed.
- Please also include relevant motivation and context. Where should reviewer start? background context?
- List any dependencies that are required for this change.
-->

Summary:
Add `platform.json` support to the `port_config_gen` Ansible module (fanout port config generator). When `hwsku.json` exists and `platform.json` contains a non-empty `interfaces` section, use them for port config lookup. Fall back to `port_config.ini` otherwise.

### Type of change

<!--
- Fill x for your type of change.
- e.g.
- [x] Bug fix
-->

- [ ] Bug fix
- [x] Testbed and Framework(new/improvement)
- [ ] New Test case
    - [ ] Skipped for non-supported platforms
- [ ] Test case improvement

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [x] 202511

### Approach
#### What is the motivation for this PR?
This is part of the larger effort to support generic HWSKUs. One of the steps toward that goal is removing the dependency on `port_config.ini` ([sonic-net/sonic-buildimage#24494](sonic-net/sonic-buildimage#24494)). The `port_config_gen` Ansible module currently relies solely on port_config.ini for port configuration, so it needs to be updated to also support `platform.json`.

The changes are in line with the existing port config resolution logic in [device_info.py](https://github.com/sonic-net/sonic-buildimage/blob/master/src/sonic-py-common/sonic_py_common/device_info.py#L443).

#### How did you do it?
- Add JSON-based port config lookup: use `platform.json` when `hwsku.json` exists and `interfaces` section in `platform.json` is populated. Use `port_config.ini` otherwise
- Define `_read_from_json()` to parse `platform.json` into the same alias-keyed dict format as `_read_from_port_config()`
#### How did you verify/test it?
Tested on T1 and LT2 platforms: ran `port_config_gen.py` via an Ansible stub and verified the new `platform.json` + `hwsku.json` path generates the same port config as the legacy `port_config.ini` path.
#### Any platform specific information?

#### Supported testbed topology if it's a new test case?

### Documentation
<!--
(If it's a new feature, new test case)
Did you update documentation/Wiki relevant to your implementation?
Link to the wiki page?
-->

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
@mssonicbld
Copy link
Copy Markdown
Collaborator Author

Original PR: sonic-net/sonic-mgmt#23536

@mssonicbld
Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines could not run because the pipeline triggers exclude this branch/path.

@mssonicbld mssonicbld merged commit 6fe58d6 into Azure:202512 May 14, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant